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

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