Merge changes from topic "hidl-test" am: 240f9e1476
am: 2c2ff9382d

Change-Id: Ib8628aa98affa5a6635bf36e3dcc8ee67293ad96