Ensure compatibility with personal compact bar

Change-Id: I985fb775b97bde78e365e3a09f918ac2c991fd63