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

Change-Id: I4a90ea46617a17a3784bc70c46b0ec6effa03f91