Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev
am: 65b4d916e6

Change-Id: Ib983d0c46cbe3de3a57da7ec1b128dbe8eeb5627