Merge "Use IEC units in app info data usage." am: 1668f18a16 am: d9d463013f am: b04872c35d

Change-Id: I4fea31a06be212c397099a313e9159740b4406a8