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

* changes:
  Update Security String to 2017-02-05 in lmp-dev am: fd48c0bf am: 63131f2e am: 6a8a7ef4  -s ours am: 6671100e am: de5e2a48 am: 2eeaa803 am: 533221ff am: 76d6a87a am: 3270d73d am: 09f08e2d am: 53cd7ebd am: 19a038d0
  Update Security String to 2017-02-01 in lmp-dev am: 19717dff am: 36d84238 am: ca32812b  -s ours am: 2e720eba am: c8d8647e am: 8e5abe38 am: 78cdf4fd am: af617a85 am: 72aef1be am: f840599a am: 555baa4d am: cc200a89