Merge be318a32ca5d40165b539e30ac5d2584fd0a2bf0 on remote branch

Change-Id: Ie4d8bf86046d221af0e9b8276551edb7ca8b00ac