Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix CTS." into marshmallow-cts-dev am: dc4b0665ae -s ours am skip reason: subject contains skip directive" into nougat-cts-dev