Merge commit 'd6cefcdc9d8f7986f0beae37c43bb8e62c75e227' from upstream into 7.0

Change-Id: Iab7c0cc770350c3a932584f2702fbca28cb331f6