Merge "[Settings] Suspend some test case(s)" am: a70e45b03c am: 9bd271763e

Change-Id: Iecbace1215fa4c150a44cc462c7157bc044250f4