Merge "Fix Settings crash when setting only decimal point to data usage...
Merge "Fix Settings crash when setting only decimal point to data usage warning" am: 3a2e3277 am: dfe237f2 am: d1dbc811
am: 76b18176
Change-Id: If62e23d750b55a292852b2bda8ab46299a7e8aea