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

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