Merge 6c497c70cd9c930c339c28641c9f7437c3e79c22 on remote branch

Change-Id: Iffcca6429d94c102ac211379cb686aca3aa1ee92