Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev
am: deca8f381d

Change-Id: Ib2d25e2ed9edad2dbc1afab272e405ea9ff3927a