Merge "Offer to format data sizes in either IEC or SI." into pi-dev
am: 52b4692192

Change-Id: Ia1ce1829a330105796ad954afca1ed61df87dd02