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

Change-Id: I442a31b91f738380ec658cdf1b7c1802a045487a