[automerger skipped] Merge "Switch from SI to IEC unit when formatting data...
[automerger skipped] Merge "Switch from SI to IEC unit when formatting data usage bytes" into pi-dev am: f0c7038e
am: 9bbb70ff -s ours
Change-Id: I15a739dc94cf5028b18ac4013023a7f74ac86f86