Merge 2d5ab82a358b874051aa327a24f09141ddbd2247 on remote branch

Change-Id: I79cc94eacda582b542057348dede5476b1b7ae79