Merge "Enable the settings_controller_loading_enhancement" into rvc-dev am: 8011ca6185 am: 89e150d8a5 am: ade42d713a am: 8595e0550a am: b4d96e8937
Change-Id: I687df7d0ae81e62e077fd4a80c6b10af4bd73575
This commit is contained in: