am 9b7ed8a3: Merge change 24030 into eclair

Merge commit '9b7ed8a377b2e0abfb0d802fc1211ace194d33ad' into eclair-plus-aosp

* commit '9b7ed8a377b2e0abfb0d802fc1211ace194d33ad':
  Improve address operator (unary &).