Merge changes I8d88c8fb,I35bf3768 into rvc-dev am: 1439b570f5 am: 4c6a367439

Change-Id: I487521338b5949a00e2b59e432cf5b812dab3a0a