Merge 2425ea62d58234fba370f96a9b7270b2e83f4ff8 on remote branch

Change-Id: I10ae437689a35e25e3329ae7ce86aacc77e4d5e2