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

Change-Id: Idb12dfde6feeabc16907d9df9cf93167d14f036b