Android 7.1.1 Release 15 (N4F26Q)
Change default OutputMode to none.
am: 6d4519ee21

Change-Id: I5253b6e2f526119f410679414bfecbe104ecbb39