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

Change-Id: I55f427850f7d1accda9594ca2b20cf97d4937be0