Merge from expected_upstream branch after sync EXPECTED_UPSTREAM file

This CL is pure logistics and has no effective change in aosp/master.

Test: treehugger
Change-Id: I828bd6f81d158a8ee48a915a3187892a4fb3f651