Merge 700fcf9a18b206789d2d0f04805a877eaf733e07 on remote branch

Change-Id: I5608ca42b1ddf906cbe608ae3931a6c5b0f24fc8