Support library 24.2.0 API diff
am: ae3fecc1a9

Change-Id: Id53c9b41740e22ee7d14f6d037de63b000a7baff