Moto Z. I updated it directly, not sideloaded.
The re-flash was successful but somehow OTA don't work.
I'm not sure if the phone battery problem is genuine or just a software bug. I really wish someone would up a link of a firmware to be re-lock and flash the phone to stock.