Shortened too long lines

Change-Id: Ia82162dd52b3fea7e76c1f47cb66bce3b7927cef
Merge "Shortened too long lines"