WIP: TubeCommonStyleFixes

Change-Id: I5caecbf4a73492758072a3dd7d533b5e7fc06c7d