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

Change-Id: Idcd4d1013ef5c0e8581f94d40ac1770dc26b38fc