Merge changes I7fd7d98a,If770a615 into rvc-dev am: 266fba1670

Change-Id: Ic5130bf201e884b3bc58b1d9e1d3fd183bdbd838