Merge "[Settings] Fix test case"
am: 9d66571966

Change-Id: Ieea99bd4da19962a6d7bd826b6678168e755cf2f