Merge changes from topic 'am-db1d7d08e9e84e6787181ebca7277df7' into nyc-mr2-dev-plus-aosp

* changes:
  Updating Security String to 2017-02-05 in klp-dev am: 7078534e am: 96ff3228 am: 5e8584b7 am: 6c8027f0 am: f9a9de85 am: cff982d6 am: f82e3fcd am: 9021a3cc am: b4bce92c am: 6a991fcc am: 31fffa19 am: dd58f8a8 am: f99b74b7 am: 4b2829e5 am: fea1d52d
  Update Security String to 2017-02-01 in klp-dev am: b1a7ec08 am: 5c99964c am: ce2b6651  -s ours am: 2c827418 am: 380ba6de am: 9baf1b52 am: 34eec655 am: 647c8537 am: 71a1639a am: ad296afa am: 4fde4367 am: 79a86d15 am: 6e4e6c16 am: 0a62746b am: 7e05ac57