Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288
am: 0d76063cc5
am: 8e1929cdc4
am: 5571ec7ba4
Change-Id: Ia7575fcff74fad69df54a352443fae5fa036b89a
This commit is contained in: