Merge "[DO NOT MERGE] Updating Security String to 2017-09-05 Bug:63846344" into nyc-dev am: 89aa0d18ac am: 6703815930 am: 6e74bc34e3  -s ours am: 6004c810a0  -s ours am: 9c8b857af3  -s ours
am: 690b7e9091  -s ours

Change-Id: Iba622d08140b22ebdc0ec278b2b518bde15293bd