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

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