I applied this fix since A01 to A04 to A06. I never had the battery leak problem again since.
I did not patch the I/O registries since I upgraded to A06 and applied only this fix and the SetSecurity patch, it worked like a charm for me!