am fb31036f: am 583fefc8: Merge "Use the context_priority extension when present." into gingerbread

Merge commit 'fb31036fd844444c395a2ae9c97439eec9f774e4'

* commit 'fb31036fd844444c395a2ae9c97439eec9f774e4':
  Use the context_priority extension when present.