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

Change-Id: Id50feb48aad512cd93b7d0d3fada0f0599470dbf