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

* changes:
  [DO NOT MERGE] Update Security String to 2017-04-05 on lmp-dev am: e2eff3f7  -s ours am: ea757ba6 am: 37aab729  -s ours am: 8a59a2ed am: 3746e17d am: b15a2623 am: 4be162ac  -s ours am: c8b7e08b am: 3e0d1c32 am: 437c3dd5 am: 21f6e17f am: 839b4346
  [DO NOT MERGE] Update Security String to 2017-04-01 on lmp-dev am: ffab6999  -s ours am: 0f30aa98 am: 05ebddeb  -s ours am: 101c043b am: 58086ff4 am: fec9d767 am: ea0d4b0e  -s ours am: 45deda36 am: 235702c0 am: 6063089d am: 85782deb am: da09c2fd