Merge changes I23545586,I0512c71e into rvc-dev am: c02e0d8c am: 2502b215 am: b63d0f59 am: 8ecf962c Change-Id: I0335eb988a98ee6512ad49f218ef803b938c55c3