Merge "DO NOT MERGE Sync Coverage APKs with Master" into ics-mr1