Merge "Display the correct default for mobile data always on." am: 737d42a0db
am: 58e9855b53

Change-Id: I7f27267da9773d4ffe8f7c476efb4839b1ba496c