Track omni their PhaseBeam

Change-Id: I7f859f9a7c1cf40d3f9e67f2b7599fa393396608
(cherry picked from commit 4be441fa58e5975e97848144cc3855318df346f9)

Conflicts:
	default.xml