Merge "Update security string to 2015-12-01" into mnc-dev am: 54cb940c4a am: dfd3524f7b
am: eca2b655e5

* commit 'eca2b655e5a57f0a13c55d815f6b18d8d03160fb':
  Update security string to 2015-12-01