Merge changes Ifdf54ace,Ib2c1d16d into rvc-dev am: d1ec74f588

Change-Id: I44ed020c30bd3c59b3c5d29802f25f397d639463