Merge "Fixed toString() printing error"
am: 0e6e776270

Change-Id: Id0f5d70a4549480fbb192628ce41796e4da04ad7