tree 0c9d5e67d1896520ea7aede586c8a7bac168e7f6
parent bda441d64d83b158ecd3040d966587e75bcbced8
author Scott Baker <smbaker@gmail.com> 1467210848 -0700
committer Scott Baker <smbaker@gmail.com> 1467210848 -0700

bring over changes from xos tree I1ee62106428a37d22fef92b0d1f29a33c661f55a

Change-Id: I907f32fc4fa90a658bebd25dc21d5a888ad6f248