[automerger skipped] Merge changes from topic "upstream-hal-v6" am: 9eba10e17f am: 05406a1175
am: 9bdc3b1608 -s ours
am skip reason: change_id If374129b61781122a113af62bb0dfd2931415934 with SHA1 305b7d5141 is in history

Change-Id: Ic9a9a89375b750a3ca0409bb4967cbb68093ea8d