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

Change-Id: I9f3b193fa07cfa8a654594af8a8120fb26456c9e