Merge "[Settings] Enable support on testing" am: 84a2951a33 am: fd3557954f

Change-Id: I943298e3312b800c019b2f98baf630dd45796e37