Merge "Merge "Revert "Configurable verifier suite name."" into nougat-cts-dev am: 9e2f90d55b" into nougat-mr1-cts-dev
am: c8439434b7

Change-Id: Ic6ae2970db036cac9e0d221f1b6dd22851fb7d05