Merge 2060bbdda04f6242b6d8d1bc3cc869423996a657 on remote branch

Change-Id: I2b61b82a87a60a79c802acabd3a43e56d85b4f84