Remove early checks on manifest. am: a5cca55a1f
am: e03003b4de

Change-Id: I6932f9a4091ad6d3d6ab1c9c2ee464becd53752f