tree 7ec96e54ddb9a0f4b7e57e03a1299c05b61caf70
parent 426edff01629bb92ac8e88f27ae25404c35f769b
parent a2cceee42fc92e76df07a6fa04ffecc57dae424c
author William Hesse <whesse@google.com> 1447456997 -0800
committer William Hesse <whesse@google.com> 1447456997 -0800

Version 1.13.0-dev.7.12

Cherry-pick 879cf82b6b29fe3669d48e75a4ecb9bc6b7f8b3a to dev
Cherry-pick aaaf7c2de8708e534acaeee60b692ba2bb08e4d1 to dev