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

Change-Id: I703ca6b0ebeec2ad92ff805e2e0296689839cdea