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

* commit '4f171b4cc25f8d3e4588513c368bd8c1df01f40c':