Merge "Merge "Fix app compaction bug and add tests." into rvc-dev am: 197709093a am: c1165d22ea" into rvc-d1-dev-plus-aosp am: 064e8da504
Change-Id: I143f7bc3243139886311ad4f955b786c6a44f5e6
This commit is contained in: