am 95d4c993: am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop

* commit '95d4c9934f27b2c7276005b0235e0da44a89aea8':
  DO NOT MERGE