bring over changes from xos repo I294b03f4729417881e22038e984016223a795746

Change-Id: Ief18e6f2602a2a63618ae1d703143861ee05ec69
3 files changed