Merge changes Iebd8d368,Ibdf24604 into rvc-dev am: 67e6a453f7 am: c4fdd14b0c am: 234535558c

Change-Id: Ifbcefc293c2af8db8ddc0043324067a23f79ad22