Merge "Updating Security String to 2016-11-05 on mnc-dev b/31618336 am: dcfd738833 am: fac5535f75 am: 405437474b am: 4afc7d56eb  -s ours am: 1ddbc7984a am: c19f6a4a29" into nyc-mr1-dev-plus-aosp
am: 7d66a07d61

Change-Id: I59a435f818eda02fc44eb81b153c803ecebe3fd9