Merge "Add byte count to section" am: ff907f66a3
am: d607ce25b1

Change-Id: I34da96bbc41cf5f8e414f13ef6dfe8c49e0828fc