Merge changes Iefa0e017,I79cc96c6,I14e31679,Ie490113e into rvc-dev am: b0c9b69e5d

Change-Id: I09bca026a70151049bc002036e6aa7f199548a42