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

Change-Id: Id8fff1e7716de8888aebf1e15eb2047b9cebf401