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

Change-Id: I5d7a7d9ae030bdd37165a2586612daa2e4a06224