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

Change-Id: I22072a5a682601a1561f78284d99d2d3953d5dff