Fix echo derp

Change-Id: I10773124936a459433a91485a96004e8356266d9
Merge "Fix echo derp" into cm-10.1