Merge "[automerger skipped] Merge "Add the protection to avoid data overflow in BinaryXmlSerializer.java" into sc-dev am: 039660c4b0 am: 206430020b am: 0b21dd3c80 am: 5670372855 am: 67fc3d4ba7 am: d6cbff76c7 -s ours am: 6e43fcb248 -s ours am: 6e0e1e2871 -s ours" into main