am 65604f16: Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1

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