Merge changes I4dd906fe,I2ef7f266 into rvc-dev am: b4a3b65d29 am: d325d82c62

Change-Id: I5811a89e9a0117e94cda6209f13350b6ea3144c3