Merge be8724f4d146dcc79d7961ede77dda50ffa8c77f on remote branch

Change-Id: I912f7e988f0e99f164b2670cca623ed72d8e8415