[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 skipped: 2b844051 Change-Id: Ie0251ce0ed1d90bb0b510b77e267ac23805b297c