Merge 0271593fcc6bf3980ebe0654a89ebede3f340737 on remote branch

Change-Id: I0f297b6ce0f5846218cee94fa7434991aa9fd64c