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

* commit '399199fe8239c11f902265b03f90dc8194e59a53':