1b87390c94
Adds MenuBuilderAccessor in addition to the cherry-picked changes. Change-Id: Ib7cc314079099c010f7d53849e204db36c410357 (cherry-picked from commit 929eea6bc1824bf98d244550c0984ecf8ea98811)