Merge 41af2cef201a96630a1b8ae1a428528b815d8c07 on remote branch

Change-Id: I0eda02ad3727f8ca7489bcc0a639fecf2aeb152f