Merge "Add keywords for system naviagtion setting" into rvc-dev am: e55fe59844

Change-Id: Iece5c56dd27f2777c725f665b3f14afa5fbc9839