Merge "Remove dependency on support library. DO NOT MERGE." into ics-mr1