Merge changes I23545586,I0512c71e into rvc-dev am: c02e0d8c am: ee784a84 am: eedc317f am: 0e36e036 Change-Id: Idb3397d2acdd096e5d15ece7b7b5d9ca1e96202a