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