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

Change-Id: Ia4c21c4183227cb1ebe7508c03f7f7a7776b332f