DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into
nyc-mr1-dev with -s ours.

BUG: 33090058
Change-Id: Ife36f0ca09c233bda7aa12a3e5314883789bd78c