Merge 2436e1427129d9f927848fd644fe364609dc4494 on remote branch

Change-Id: I4a734cd6754fa12f3383eb8b4057c4708c7d0ed6