Merge changes If5ccacdd,I381a083d into rvc-dev am: c9035d7d am: 370809e2 am: 2288d798 am: c079bb30 Change-Id: I1ea9f126161fbffc9903e618dab168b15589a015