Fixing line lengths and messages in asserts Test: Not required Bug: N/A Change-Id: Ibb35923b5fdad2cc57c9960219d575d74dcb4a47