tree f9ec0fbece0c457206fcb5dda50bbd74bee05650
parent c0637fccd8a28b2cc84249957046d00f6c3a3cc3
parent d2a7276494fa25fb88054ac878174e8aff376c5b
author Dan Grove <dgrove@google.com> 1495828320 -0700
committer Dan Grove <dgrove@google.com> 1495828378 -0700

Version 1.24.0-dev.6.4

Cherry-pick 97b750425db5568aa16f3cf0fd808d933151e2dd to dev
Cherry-pick 93864c0db92d0a4066912507cbf5466b50996cc3 to dev