Merge "Merge "Consolidate the HealthStats UI to only use milliseconds." into...
Merge "Merge "Consolidate the HealthStats UI to only use milliseconds." into nyc-dev am: 4c4afedf am: 2d7e6746" into nyc-mr1-dev-plus-aosp
am: 8ac95e8e
* commit '8ac95e8e':
Change-Id: I9afc22133954f6566178a53f5316744f21e96189