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

Change-Id: I2d0535506e3da53eb4cfd5faadcccaa9a5bb2e2c