Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e",...

Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev

* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9 skipped: 8501efda skipped: 14f5e782 skipped: a827c465 skipped: skipped: c73989b3
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9 skipped: 8501efda skipped: 14f5e782 skipped: a827c465 skipped: 7dbf8e14
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9 skipped: 8501efda skipped: 14f5e782 skipped: a827c465
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9 skipped: 8501efda skipped: 14f5e782
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9 skipped: 8501efda
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128 skipped: dd276ca9
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7 skipped: ccd89128
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017 skipped: df3319a7
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4 skipped: ab40f017
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe4
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2 skipped: 91084647 skipped: e621f5b6 skipped: affcc08a skipped:  skipped: aa694967
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2 skipped: 91084647 skipped: e621f5b6 skipped: affcc08a skipped: 01433de2
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2 skipped: 91084647 skipped: e621f5b6 skipped: affcc08a
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2 skipped: 91084647 skipped: e621f5b6
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2 skipped: 91084647
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f skipped: a359a0a2
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5 skipped: b384901f
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56 skipped: 6dc142b5
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb skipped: a80adf56
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241