Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8da am: de55480c09 am: b364aa806d am: aae3064e18

Change-Id: I01ca913142880b3f21be0726a42e424ca536ac6e