Revert^2 "Merge branch 'upstream-master'"

82f9901c43f5c647d7cef5fad37ec991439071a8

Change-Id: Ic261e0423897bd7cf35186431026b859aac66048
128 files changed