am 10853b92: Merge "Asset swap" into honeycomb

* commit '10853b92cfe9334099c56993a53c3b9bbe299a4a':
  Asset swap