DO NOT MERGE ANYWHERE. update support library from build 1828919.
15 files changed