Android CTS 6.0 Release 17 (3866870)
merge in marshmallow-cts-release history after reset to marshmallow-cts-dev