Merge "Correct a typo in config name." into rvc-dev am: 74fa3ce36a am: 8a237b581e

Change-Id: I6f51e46f21d2817aac6bea9ce36971c087345b0b