Android 7.1.2 release 18
Change default OutputMode to none.
am: 6d4519ee21

Change-Id: I5253b6e2f526119f410679414bfecbe104ecbb39