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

Change-Id: I006172e9f119b5586e71d174dd6f1ecf63a2464d