Merge a27fc25350403ce1506d8f53d51bb7e997d78aea on remote branch

Change-Id: I3a6161e980aae2ed0f43ce2e6737124f3dd14d32