Merge changes Ifb23a73a,If1854a77 into rvc-dev am: 9d3317b8 am: de55480c am: b364aa80 am: aae3064e Change-Id: I01ca913142880b3f21be0726a42e424ca536ac6e