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

* commit 'ec10c4f2d726c76d64d77f89731bcdb91f12bfa0':