Merge a2eff613e1462cbb96f641b91da6e9c9f8aeb040 on remote branch

Change-Id: Ida6c986d4f405db289c91b89b5a10b5e16c9ffc2