Merge eb9255f5c0a7f923373c30f0918f7f53a5bf0640 on remote branch

Change-Id: I5ed5b1adee32bf8ddfec447d5d3228e90c9eaae6