Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am:...

Merge "Update Security String to 2016-11-01 b/31618336" into klp-dev am: e5ecc61c am: fcc6e603 am: 0f9242c4 am: 57370e1f am: e13d8888 am: 25019ad3 am: 3ffb2d23 am: a983e8e7 am: e8e35c03 am: 5673cc31 am: 5fd0f924 am: ceda55a7 am: b1c34882 am: 514aa651
am: 3e206a84

Change-Id: I39dfe685fd744b270a13db3b92e94a7bc60874c0