Merge changes from topic "power.stats HAL" am: df43c41b27
am: 9d21a5b185

Change-Id: Iafeb5e9d5d89bee43b15388b67781db806745018