Merge "If the menu hasn't been created yet don't do things with it am:...
Merge "If the menu hasn't been created yet don't do things with it am: 104be2e0 am: ef9a1620" into oc-dr1-dev-plus-aosp
am: 4c3896a9
Change-Id: I8a70521c35d472dfddbdf16f6dab1bedb1a4a9e1