Fix broken MenuItem coretests
am: 101ab58e26

Change-Id: I5fa8da7c7455aa1e72924ea04d8e43580ed69765