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

Change-Id: I61d9a5efbe043d76c5500b3a483296ec9bda05b2