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

Change-Id: I5d34e3ea3f1e5bd4618fd5dd0dafdb74d7fd9fc8