am e66798b1: DO NOT MERGE ICS MR1 Backport of Some Tests

* commit 'e66798b1084ed6ca321b9bf93ea3677c45fcfda1':
  DO NOT MERGE ICS MR1 Backport of Some Tests