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

Change-Id: If11d5e19433907b331ae5a23c11d8a02454b3384