not sure why I tried to pull/merge straight from cm :|

Change-Id: I3074a5c86c2f1eb3c2923d1343e44a5a00594ccd