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