Merge 42d680e21f15078fa16d6380ca68ece54b4bb780 on remote branch

Change-Id: If3b927479b46e7ff69e052e05426a876d321f338