Merge ee821931e89a915efc3fc2cde733d694b2afc47b on remote branch

Change-Id: I87e8a47bb0a785af70634f0c883b84bcb2623af8