Merge "Added Voltage and Current regulator ftrace events to atrace"