Fix go/lem breakages on baseline configs
am: b0a9747b36

Change-Id: Ied99822007724529ad2e2b843f45b87437b701bc