Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a  -s ours am: 15d200c399 am: 0d1b7e183d am: 25eee603c8 am: 19ebbf50a4 am: 9f13a87b82  -s ours
am: 54b51dc69a

Change-Id: I0f17739403d07c5452a9bc5efd2256f10e5fbc04