Merge e998a8b87aa476eef4082ef161f0998e0c6106a3 on remote branch

Change-Id: I98b97b9d19af6b1cce7df3744087081628765585