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

Change-Id: I56ca5aaa8a43bf9fc9b4d0b4bda368aa432cd697