Merge changes I7da699ca,I5a09efef into rvc-dev am: f21e3a96d3

Change-Id: I6ab184863727b8889eea902604d353267cd58f26