Merge 24b2d413b4a0f474b4b2a0af3493840d64b70814 on remote branch

Change-Id: If40261b77503e448c16888898dc37c8e725a9133