Merge changes I3c9bd771,I244c3624,Ia7e87750,Ifb5e93be,Idda6b89e into rvc-dev am: f9da59b9f5

Change-Id: Id402247f99e5e672c5a108dbb63a10d0cf37f350