Merge 8e2cd2a1994c769a8442fa1a8a4fbade6a8fb938 on remote branch

Change-Id: I5a146802a55a23acf7ac81d6377b59d8949627b3