Merge "Fixup App Compaction CL nits." into qt-dev
am: 393ba51cbd

Change-Id: Ib4454434482b95a571fec83f0ed33b375686f2f5