Merge "Log correct number of whitelisted packages." into qt-dev
am: fefd66a530

Change-Id: Ib172091adddf8b04bbb9faa5729aa83c474bfc6c