am 72aff731: (-s ours) am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1

* commit '72aff731f0640ac6293b1ba73b6e4a5c37a2f864':
  Remove dependency on support library. DO NOT MERGE.