Merge "Add tests for TransportStats and some refactor" into pi-dev am: 5dbde05f06
am: 4e881b9e49

Change-Id: I5507adaf8046cab2012bb28ef4079f5514ecf080