Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607

Change-Id: Ib9381a872980db7d506625e7645618e80f375290