Merge changes I7dc8f5fd,Ia5262ca7 into rvc-dev am: 279238f3c2

Change-Id: I24abe6eee081c480905df7f1866d4fa1076f402c