Minor lint in base manifests

Change-Id: Ic3af7564829808c09485a71a24280f568cc82e35
Merge "Minor lint in base manifests" into production