Merge commit 'eae337cbff4e792cd0b428758ab7ba3d2474f688' into rvc-dev am: 4ee72ecf8d am: 22b573c949

Change-Id: Idd3a3365a4b1c96e1dec4fb652325078ccab5c40