Merge "Add wakelock action in testing app" into oc-mr1-dev
am: 08fecc4143

Change-Id: Id3125640f4d62da1161b9e894577c6285fe7c83a