Merge "Disable the charge popup when the roaming is turned ON" am: e6fcfba051
am: 8fd6e1147d

Change-Id: I2f46b90e09312fbe21b1b54d1c0d5e2500a811ea