Merge changes I7bb9d561,I2748d4a7 into rvc-dev am: 0df912df57 am: 07cf4177d3 am: 53980b243c am: 441a19869e

Change-Id: I2ace6bbfb7923330c1def215dfb1f9024e70f2f7