am 25cb8bcd: am 2dc59d56: Merge "Fix bug 3347747 - Use a better context when fetching resources for action modes" into honeycomb

* commit '25cb8bcd19231dff29b9ec80ba94d263068465bb':
  Fix bug 3347747 - Use a better context when fetching resources for action modes