Merge changes Ib5b3b032,I81147568,If9218d23 into rvc-dev am: 381b9c17 am: 63c6bf73 am: 7185aa53 am: ae44c39f Change-Id: I27d3f7598ab0c198cee292ab1d22c1fc80979794