Merge 27b66abd43e1dadabba73dda58a1912d4fa829a5 on remote branch

Change-Id: Id932c0bc5b157952649d3bdf3081e1d83bfc3b8a