Merge "Added actual (unpooled) wakelock times." into oc-dev am: 43ffee060e
am: 71e4068997

Change-Id: I0c78fe79ba4525116bc8e44c932f77204b632eb7