Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev
am: 24b0486cdc

Change-Id: Id291ae046845660231be5b42473ef9b839055035