Merge "Whitelist free short code batch for 2018 Q3"
am: be338ad5a0

Change-Id: I550067fc39ab9554d761981af108b34272c4ed22