Merge \"DO NOT MERGE ANYWHERE Support library 24.1 is now 24.2 r35\" into nyc-support-24.1-dev
am: ef1742b550  -s ours

Change-Id: I4db1d554a8966f14d4af1d5dc20d419f7a6947c4