Merge 25e4249b606b428c62430f95737caffdad4be0f6 on remote branch

Change-Id: I7defe9e18048fdcddc782781939387262c51f168