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

Change-Id: I585ee47ae511338feacf47f32fe6a4c42b2d52d1