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

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