Update from adb (10/38)

Update from adb