[automerger skipped] Merge changes from topic "upstream-hal-v6" am: 82d6654ade am: 8b7e1af6ee
am: 430c4038af -s ours
am skip reason: change_id I3347ee3aabe753d34c69dacbd707c60105d80a47 with SHA1 c5b098a76b is in history

Change-Id: I20e344d2ff8e98387fbb2aae019e43bcc8fc6c38