tree 2c47428e096a18308147c1efafffd18cb6110b02
parent 7ab0221025b40522238720c3ca0092e55ec3608c
author Scott Baker <smbaker@gmail.com> 1467238981 -0700
committer Scott Baker <smbaker@gmail.com> 1467238981 -0700

bring over change I51408a2fe7dbe6ebeb60fdd0cd79375c8293d8c4 from xos repo

Change-Id: Ia167ba46a2591cf379887e236b08bcf0054ecaa6