tree b6448651576738465968f02bd0a85472e4533808
parent 2739d52ef96c80fa5941cce1089998f1ce71bd52
author Scott Baker <smbaker@gmail.com> 1467210996 -0700
committer Scott Baker <smbaker@gmail.com> 1467210996 -0700

bring over changes from xos tree I4f763c224e8545363a2d26efc3efabaea30594a7

Change-Id: Ibd6742f3adb570ec1a588caa7a1c821b55e163e0