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

Change-Id: Iff52448e0f4f522d5c5cbd59efbd1a734bc95570