Merge "Whitelist free short code batch for 2018 Q3" am: be338ad5a0 am: 262153bdda
am: 98ece3b77b

Change-Id: I16a89d4a06b3bd9be0dc3e2167c990bce4b73749