Support library 24.2.0 API diff am: ae3fecc1a9 am: 56477c1fcb
am: c2ca61749d

Change-Id: Ibcab8cbff2b2a5f99bcde98ed57925fd07a75dd1