Merge "Fix mobile data settings UI bug." into oc-mr1-dev
am: 302aa43d1b

Change-Id: I24a8c3b6586be8de73217f69bf8f34548144cc12