am 429a60b4: am 4ff98d1a: Merge "Support setting capabilities in the top 32 bits."

* commit '429a60b4bef02f2055660dbeedbc97c645ef76db':
  Support setting capabilities in the top 32 bits.