Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61cf1 am: fcc6e603c1 am: 0f9242c4d2
am: 57370e1f68

Change-Id: I38ac268882f035cb3ede21264dc09cb7636b2e6d