Merge commit '14db637' from origin/upstream/master Change-Id: Icd396e16b58fe3c43e69184daace8e4b700ac57a