Merge 297f4b8d341ac7e6a6db6fe2eec0e986e6e91e90 on remote branch

Change-Id: Id00ff739d37523ff892b5de1ac5ba81b6e4e1bbe