Merge \"Change default OutputMode to none. am: 6d4519ee21 am: 91eff0693d\" into nyc-mr1-dev-plus-aosp
am: 82b3571954

Change-Id: I423ccc8a1a8e359dc4d398cbb87cc2cd4b1cadaa