Merge changes Ibe02e76d,Ibb542595,Ic63aba39 into rvc-dev am: db283837dc

Change-Id: I6d09fdec6de7cb65d20de39e2f42e00c35b83d8f