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

Change-Id: I28a1f7d36b44f8a825c2d45c123305b3e9951cb1