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

Change-Id: I0f514c2c0eaaac94140b8cdc8407478abc606c35