Merge changes Ibe02e76d,Ibb542595,Ic63aba39 into rvc-dev am: db283837dc

Change-Id: I88be1ebc73829561c5cb845630b19ea109b122c2