Merge 2fa2013f4d1b43c56ea0bcc59814173331c10f42 on remote branch

Change-Id: Ic457fc8536fedf6a6685d0f4de0aca58500cabd0