Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev
am: 8ce50255c5

Change-Id: I0ece40e7e6fb98d3c029bd26d6b35fbcb1ee66c0