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

* changes:
  Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af577 am: a74871cf am: 32e254e2 am: 2d08201d am: 0e9ae809
  Update Security String to 2017-02-05 on nyc-dev am: af635660 am: f6dbc772 am: dec80c41 am: 89e90599 am: 94fbbd20
  Update Security String to 2017-02-01 on nyc-dev am: 35901a7f am: eaf4508b am: 2cc397f4 am: 548f3ec0 am: 0dd5eff8