Merge cherrypicks of [16671234] into tm-preview1-release.

Change-Id: Ib3de1a0c25825582f6a9ceb6c967cc3a82b95785