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

Change-Id: I97b4f438d2b452a2321eb2a1f5c8f69f6301b6f6