Merge 952c0894ba7abf899d3f6ecac9e7f9a7779d5745 on remote branch

Change-Id: Ic1dcbf5bea6af45f5951da1ef5b76ffde3774a15