Merge "API 29: Current SystemApi incompatibilities"