This includes adding the new DISABLE_NAVIGATION flag. Bug: 3000770 Change-Id: I6d1c3586198e13e06b5d26e8b23a9495dc4ba02e