[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix @Ignore on class when it should be on method" into pie-cts-dev am: 4cc6d132d1 -s ours am: e28007ff69
am: 1a4343003f -s ours
am skip reason: subject contains skip directive

Change-Id: I4665324e6d04f6cbab163de3a3e4d0868e3123f5