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

Change-Id: I015ac31cfa54a5a9c5a573ce29a77aa5b8bec1bf