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