94ea8fa77e
Also slightly optimize getName() by using StringBuilder Change-Id: I7037ba0204378a716bc292d5ced710e0ac37bb78