Merge "Sign each APEX with different container certificate" am: 317acfe74b am: 17255b3576
am: b7ed58d7c4

Change-Id: I3b1a1bab14286441e4e6cb5119be9daa7dbf5b24