Merge commit '6dc3a21' from origin/upstream/master

Change-Id: I23fa70c7f39fc9166975602df7bcbceeea240bb8