Fix H302 errors

Change-Id: I0354b4c99fb6d22ede85ec711fb81c2bb3627f99