Merge "support "sideload over ADB" mode"