Merge a625c77e625f190dd01ba812f8f7b5e93b098838 on remote branch

Change-Id: I22677e9c1daa04630dfe43f6d4dbbf515156539a