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

Change-Id: Ic3a5bb04189779d0932663b690d37fed095edabc