Merge changes from topic "apex_manifest_pb" am: c1e6529305
am: 6767b3ee16

Change-Id: Idc52679c254be2bf71e5698a94b7f5d772d605c6