bring over change I51408a2fe7dbe6ebeb60fdd0cd79375c8293d8c4 from xos repo

Change-Id: Ia167ba46a2591cf379887e236b08bcf0054ecaa6
1 file changed