Merge a9949c7d87aa2ef0134fab48d4bfe2f89d33b0d8 on remote branch

Change-Id: I5e2462e899a2642186e73f886f318454e4ae29d9