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

Change-Id: I490a82658216658d6c44c10631604270b748d2e6