445a14f4c6
Fixing a few more pylint issues caught when using pylint==2.9.3. Change-Id: Ie7ca61e1a8083a40e0ffccf1418192966884707a