Merge changes I926887cc,I7def937e,I530f6d89,I393fc3c4 into rvc-dev am: ad17ebe23b

Change-Id: Iccf5391bf81db262d09b0f4a41c4683f7ace3f2b