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

Change-Id: If13158f209eda968f0fd50787679c957a3e5ea96