Merge "Wrap around text so that it isn't cut off" into rvc-dev am: ae0bc25d am: 8629cfaf am: b9afd221 Change-Id: I410a98d9903cdd9ea27c0c555eb5a6d4f31cbc42