Use descriptive heredoc

Change-Id: I7ee9dbee39a326c7e9911fbaba69d38c2da690c7
Merge "Use descriptive heredoc"