[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix CTS." into marshmallow-cts-dev am: dc4b0665 -s ours am skip reason: subject contains skip directive skipped: 78f64660 skipped: 8ca6ed45 Change-Id: I12a5ab4c3999a0da3c07fded8af9de631167f1f9