Merge b47b79d4b5a959b0f3e4b874dfc72035ce991c65 on remote branch

Change-Id: Ia54c63d3418e1d259f0ebdc64bd9d5b20278ba9f