Merge "Fix Google pylint warnings."
am: bcd229277a

Change-Id: Ia7948dfee4dbb48957c4e0ab4b5517e4d9cff71e