Merge "Fix sideloading" into fp2-m-sibon