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

Change-Id: Ief2ba0f1b8338b5b9472bb2837fcb778d2652aba