Merge "Fix announcement of global actions menu" into oc-dr1-dev
am: 5d378e5f2a

Change-Id: I70c42c2febf4cfcd23584bdf151937857d8982ba