Merge "Enable the settings_controller_loading_enhancement" into rvc-dev am: 8011ca6185 am: 44a98caa0d am: 6721c8e1be
Change-Id: I8348fd35c38404e4130f1b080b44d9a9286e203f
This commit is contained in: