Merge "Merge "Change low power stats format to make it easier for parsing"...
Merge "Merge "Change low power stats format to make it easier for parsing" into nyc-dev am: 49bdf11c am: 7b786529" into nyc-mr1-dev-plus-aosp
am: b94a66be
* commit 'b94a66be':
Change-Id: Id870ac029063460f73242b6bb9164737bc2f813f