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

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