[automerger skipped] Merge "RESTRICT AUTOMERGE: Move @Ignore from class level to method level" into pie-cts-dev
am: 6c24c56a11 -s ours
am skip reason: subject contains skip directive

Change-Id: I725c4ccfc176185dcebcc09ad384531bc0e479b1