tree 3bddc79cf65caedb6ce17622011d31a4a695ea54
parent 65738e3fd83ad0e59ff8d48a11f48f04a8417b78
author James Tucker <jftucker@gmail.com> 1506396518 -0700
committer James Tucker <jftucker@gmail.com> 1506396518 -0700

Address some post-zircon issues

Change-Id: I8616fd5cd6f20885b511f0405ce4fb14148f80f1