Merge "Add Dynamic tiles for Settings" am: b576e24d73
am: af4605f4d6

Change-Id: Ice8eea9d84237ddd2bc50b3f99e50e5ecf12c009