Merge changes Iebd8d368,Ibdf24604 into rvc-dev am: 67e6a453f7 am: c4fdd14b0c am: edc395980f am: 9af269cbbe

Change-Id: I05a8c229d1d20d1113536ce05152ef47854fb592