Merge changes from topic "upstream-hal-v6"
am: 82d6654ade

Change-Id: Id139d689d7afb0aa0c23501cd771060b2f87b677