bring over changes from xos tree I1ee62106428a37d22fef92b0d1f29a33c661f55a

Change-Id: I907f32fc4fa90a658bebd25dc21d5a888ad6f248
2 files changed