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

Change-Id: Ib0f308deca6d9cb6f25a8c0b2ad710676a936f49