Merge changes from topic 'rs_hidl_impl' am: e43d46f059
am: a77e9c6399

Change-Id: Iac7c22c33979ec5b2881af9f03f91b6fef8c950b