Merge changes Ibd8ce581,I04cc955d into rvc-dev am: 0081f253 am: b4dfa05d am: 3135110f am: 35e2d054 am: 8ad8d7ff Change-Id: Ie8c7899b9bee50f5591e135c1fb86cc034f119c7