Merge changes I41959627,Iba316772 into rvc-dev am: 9a979fb217 am: d806110483 am: 72be55f662

Change-Id: If0c58ddc96d7c69a40a0c814c8eacfbebe65ad21