Merge changes from topic 'wakelockTotalDuration' into oc-dev
am: 6b1989c7e2

Change-Id: I04a7323ed927ebfad40129166d7e0cc61be7b3af