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

Change-Id: I50bc15d442c4b61fddc83df7f1946b1873dd97cf