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

Change-Id: I547d3e7830f4815f0483c236192bd099bef5cc18