Merge changes I7bb9d561,I2748d4a7 into rvc-dev am: 0df912df57 am: 07cf4177d3

Change-Id: Ida3c3d980b0d89154fdfd61e28aa4f8915bc37f7