Merge f3b51cda2251908d1b47b1bfdc13e02e5bb3c4d2 on remote branch

Change-Id: I011629970551f4ccefe1945421329af4fdc600f6