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

Change-Id: Ic0ce51c021770db45e3fde6f15fcb8c123ee5587