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

Change-Id: I6cabebaf6f5e39faf4bf0417eb7e88479d96947a