DO NOT MERGE ANYWHERE. Update support library @ 2958724 from nyc-dev
am: 414c7cb7f4  -s ours

Change-Id: If9227df7da0fd354e3ed964bfc6048bf40da63b4