Merge 89ffd1fafb07b75217d8b4a9979fa946c7d2cd48 on remote branch

Change-Id: I625f172f473656e354dd087587700983201db182