Apply from adb (16/39)

Apply from adb