Merge "Add config to show an alert dialog for video charges" am: 1451124f86 am: 2c773d3f96
am: 513044b23a

Change-Id: I94af04cf0fca1dbcb6bb66cddcd473df22790f5f