Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276