Merge changes from topic "upstream-hal-v6"
am: 9eba10e17f

Change-Id: Iab5205bff43f4e914eec8ab6c68bf46a5ffde16b