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

Change-Id: I55aab58a1c2cd59466cc2fdcbe1b8ce9a1eaf961