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

Change-Id: I07d2017ef71d2ce17d4a414d26efff9894d93d63