Merge 10e1e1eb6f8c64872c7507b4d2f6253309afeb99 on remote branch

Change-Id: Ic69430e9e40730cec58f7d8157b1d29aa951eee8