Merge "Fix Google pylint warnings."
am: aa5f2ccde2

Change-Id: Ide1a5bffa1745737142ffde982268addd8c253bb