fix non-deterministic test failure by clearing out db

Change-Id: I264a385df9f7a28fc6c1ce7bf2fc4f809c906f5f
perform app staging from App model

Change-Id: Icc08fd31ce158828364310d94386ff3b4e6d7818
formatting

Change-Id: Ieb477fadd2ab9b208683e9384010366b15e9d2e2
indent App model

Change-Id: Ib2ce8a989b3855eaa20e9a735dedd0c7a4b835b5