Merge changes from topic 'rs_hidl_impl' am: e43d46f059 am: a77e9c6399
am: 58ab9c1468  -s ours

Change-Id: Ia891856c751a473f9928165f6d759087c6d85cad