Merge 9cd57b6ea3f6d1db9bcb9d0d601f4546adeb32a0 on remote branch

Change-Id: I541b453ae2100d31347ed12010aaad01802b58d8