Merge "There must not have newline character in wakelock name" into oc-mr1-dev