This patch also fixes some long lines. Change-Id: I8eb6ad6131ac67bc6c4df452430357acdc84b6ad Closes-bug: #1611276