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

Change-Id: I946e31ad133d4e2033972326b9dc1aa1bede2613