Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552
am: cfbb865e29

Change-Id: Idb5c1e9cc98cf9e235eaf4de07a94c26eec3455a