Merge changes Ibca1d27b,I8cc6f5ce into rvc-dev am: 6d5625c5ce

Change-Id: I4216e24e558bd243a50a3f2d68a370a786d3502b