am 043d34c0: am 10853b92: Merge "Asset swap" into honeycomb

* commit '043d34c0959099b564327ad26b798bcdbc60d2e2':
  Asset swap