Merge changes I80f66d19,I68810035 into rvc-dev am: 8d974dc239

Change-Id: I83f1f23567ae8ea373708fa60afbd63436cd5ca6