Fix go/lem breakages on baseline configs am: b0a9747b36
am: 8da7cc0f26

Change-Id: I30eb0ccf833d78efe915171145a8487ba31e74d6