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

Change-Id: Idcf24d6432696dfc56754bf97b104bb250c0aaf7