Fix [H302] errors in contrib

Change-Id: I356753e791e574ee45b3b254aaeb80b242e13b23
Merge "Fix [H302] errors in contrib"