Adapted to changed menu infrastructure.

Change-Id: I9f82459f026f490b2c85ff7deb3721d825915bef