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

Change-Id: I48769a2ba50a0bd03d34289940dff0675fc7d3a1