Merge "update SDK_INT in the fake" into main