Merge f60fd6f1a7ad68b091f5c7789caedf4d54857189 on remote branch

Change-Id: I5c016254b6817f9d3bc69a969acd94e381c19e1f