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

Change-Id: I832c6e037d74d44de610facc58ed4e0deda6c667