Merge \"Added config system navigation keys.\" into nyc-mr1-dev
am: 32300db186

Change-Id: I9de582c7ae95aa36fbae75be6b72b4ffc01ae695