Merge 6de9f812fc7dcc92997236b59044ac3cd56e7e49 on remote branch

Change-Id: I24a119537e38e659030be487ac776d59e9ea75e0