Merge 85225713e215288c686aa88b0524d7c02dc62699 on remote branch

Change-Id: I0afa318c47d2f6c9453da28155d3a894ffd3bc7d