Merge "add default cpu.active power consumption" am: c13747693f am: d3859f38b0 am: df5f8637b6

Change-Id: I51a423100c9c657d8e1c323fdc7578080dcbce5d