Merge c4a23c3f5c475d234c11d28d5809fe6e9b24ae80 on remote branch

Change-Id: I79829ff57b6ce9db9895715c7016fa5800c3ecec