Bug fixes

Change-Id: I3b40429bc6ec4d60d882676b812446e3d1e7dade
(cherry picked from commit 7a804af87ffd527fd00b03d34c167e57799fc334)
1 file changed
tree: 9832e034bd108e51d513be7b613ee71ce5097e86
  1. xos/