Merge 1e0e1b52a7940cc058d98d4e739743de9bc9eddd on remote branch

Change-Id: I2786a872bba7cff478c4e124cd6c2898e39256ea