Merge "Merge changes I7c6f57a2,I86b6d31a into rvc-qpr-dev am: a1603bbd9f am: 6f54008cc1"