Merge "chore(rpi3): remove redundant code" into integration