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

Change-Id: I40976bfd0d51c437c9dd706673f74359d9e137a8