Whitespace cleanup Pep 8 line length fix Bug 1039112 Change-Id: Ib11a6817f999802d90764404a5efbde33ce6e9eb