Merge ce2b570d8670d2a2c3110c39194951e486b73617 on remote branch

Change-Id: I6e60c07876765b921543708bade62ae88122e883