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

Change-Id: I3e4f453f37fabe0e5358b32272d38d93ea97b28c