DO NOT MERGE ANYWHERE. Update support library @ 2954802 from nyc-preview-release
am: e6cf89fb7e  -s ours

Change-Id: I2913cd6d0a5772347d8faf5856657568a50ddd26