Merge f2274a4c3cde5b707d88701f78b13b6c47b9c000 on remote branch

Change-Id: I48d49c6e10b681552b75ac673bdb838d8617e370