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

Change-Id: I23007891074df83d736b29b4236e27d90a972986