Merge "Fixed toString() printing error" am: 0e6e776270 am: 6cdb4fde08
am: 9eb509c14e

Change-Id: Ia75eefba3ec6ca4fbc7aaf7c5aee362d33fba9d4