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

Change-Id: I06f8e2e8a41db411cee82f12896c8d6e5f211803