Merge ad56adf46fc36c2c647ddb7e9f6bc8d557baaee3 on remote branch

Change-Id: I87922ca4daeb387a4995caba04893224dac1a0d3