Merge branch 'upstream/master' with latest upstream commits.

Change-Id: I9858a6f66c86bc1976212d0acc0a841fda8472d5