Merge b8db7a98f9fec8ea03035a1807652599217a2bb1 on remote branch

Change-Id: I349ffe51b7c49aab153f58e5cb665125ec11a5c3