DO NOT MERGE ANYWHERE. Update SDK and support lib from build 2085979.
17 files changed