Merge remote-tracking branch 'origin/upstream-master'
am: 5f41254b59

Change-Id: I24e8596770fdbf99d7634b8b1af15f4a234afd24