am a320505f: Merge "Move both app code and data together." into mnc-dev

* commit 'a320505f3a39e21f29065f0f2a01089363825318':
  Move both app code and data together.