Merge changes from topic 'rs_hidl_impl'
am: e43d46f059

Change-Id: Ie5c9182f95644013ed452ee0c485b9db9d927453