Merge changes I9f0a440d,I0b734cc7,I510ee307,Ia257021d into rvc-dev am: d050812a30 am: 0d5b2e85ad

Change-Id: I141d4fc9eb1370419fc0e189d8c5af132748559f