Merge changes I14bb4722,I01f139b3 into rvc-dev am: 07b29771b8 am: c094bbe825 am: a65fd04d37 am: 27e22c44b6

Change-Id: Ie74a83184017c154d30e57fac99a294edc64d522