tree 725d32a1c6b609abc4ce5ffb3004d6c0fa8f5a9d
parent f9f6c90ed1314ab27403816040c9cfa1e3391ebe
parent 41908a54530120b68a79e0fd22b5e709d33cced0
author Austin Clements <austin@google.com> 1480957479 -0500
committer Austin Clements <austin@google.com> 1480958150 -0500

Merge branch 'master' into dev.garbage

Sync to 1.8 beta 1.

Change-Id: Iddd3773babd8fe50aed791ef7150d0c7c455cc8d