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

Change-Id: Iabb703e04ed3664d55b8265646e1c2ecb8d09dd1