Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r28" into marshmallow-cts-dev am: 13405161e5  -s ours" into nougat-cts-dev