Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
am: 37e6acd9a5
am: b99184d84e
am: 4be8b73f3e
Change-Id: I6c96c53d6c3cbccb085e37cc6a4a79b7cd305e66
This commit is contained in: