Merge "Remove checks from partial manifest build." am: d926bde44a
am: c629e66447

Change-Id: Ibe5b17fa9a2dc33189bafc2ae4828ac23a932e0c