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

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