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

Change-Id: Ide8562bd39eb0ea63de2e74a400ff4846f3440ae