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

Change-Id: Ia1a607c16cd1bc27f4fa08e4f2c31601bddf9fa2