Code hygiene: Consolidate menu creation code

Change-Id: I85e9cdee999f4d698f97516ce732148874e0e2df
Merge "Code hygiene: Consolidate menu creation code"