Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc94b

Change-Id: I1cc8d8227f04f5fb307cb2f4ffc803f5970e5bb1