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

Change-Id: I1c5eb6a217ed1faaae0ddcdaf2ed7b167aa9cc99