DO NOT MERGE ANYWHERE. Update support library @ 2954802 from
nyc-preview-release

Change-Id: I18e7d43988951590f68361bb6070f677497cca44
21 files changed