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

* changes:
  [DO NOT MERGE] Updating Security String to 2017-04-05 on klp-dev am: 502366cd am: 3ce29b8a am: b0cef41b  -s ours am: 8f86884a  -s ours am: c901cec8 am: a150db65  -s ours am: 28ecd6fd am: 58300f46 am: 764c206e am: 533ca31c  -s ours am: 4a18b463 am: 1cfaef42 am: 4fae3e67 am: 3ce06ee4 am: 1e00b70b
  [DO NOT MERGE] Update Security String to 2017-04-01 on klp-dev am: 00c627eb am: 5be6d3bb am: ed387848  -s ours am: 84702d99  -s ours am: d4661753 am: bc19d814  -s ours am: 53a64664 am: caff84dc am: 2f222829 am: 69586d29  -s ours am: 8f510b8c am: 34f2511b am: 8bc2b6dc am: e62cac07 am: 67621213