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

Change-Id: I2fedac34e164ad203b5edbf0f2129528cd0fb118