Merge changes I9be69af5,Ib85ee393 into rvc-dev am: faf1d06d45 am: f9415dcb9b am: 0ae5257f8b am: 7a498e2a15
Change-Id: Idd3efeb0e0fb2f346c601983e63165b2fee2405e
This commit is contained in: