am c4f74d71: (-s ours) am bde695b2: (-s ours) am 4eefb991: Merge "DO NOT MERGE Sync Coverage APKs with Master" into ics-mr1

* commit 'c4f74d715e0f81b8df81db2f586ab48f7ec0a608':
  DO NOT MERGE Sync Coverage APKs with Master