Adjust code for API council feedback

Bug: 151322799
Test: SettingsUnitTests

Change-Id: I5ff389f3f707e5538979830c2252455bea5bbb88
1 file changed