Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569
am: 5b6dcf42af

Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5