[automerger skipped] Merge changes from topic "carrier_certs_cherrypick" am: 786d84b690 -s ours
am: 5a8b58fe6d -s ours
am skip reason: change_id I686647419896a1780f0697b3ed5d319363675f5f with SHA1 293ecad827 is in history

Change-Id: Ib893e192667c080b77ed67a062deb88782a59e81