Support library 24.2.0 API diff
am: ae3fecc1a9

Change-Id: Ie9a007ad44ae0293ef4c4138888da0e78d61b322