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

Change-Id: Icf5710f90818ab568ce3f14318f6c3215babd492