This avoid a conflict in PieMenu.java with bb merging

Change-Id: I3ba1434e245c876625243040c8b151e9955740cd