am 9c3850f2: Merge "current.xml" into honeycomb

* commit '9c3850f24e66d4c61337e749da843444cbb65d10':
  current.xml