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

Change-Id: I45ff845e5cf67d738c1f25b26bcd7acfe50ea9eb