Merge 12fa6cd08061b78ae0cabf05d669444c660b4216 on remote branch

Change-Id: Ic3abf420d48249dfef2ea337d4fca7b65dcea774