Merge "Consider whitelist when listing class members." into pi-dev
am: 60d7315fb7

Change-Id: Iaeb3b875ff0074c82f1f77e691852418c4c6d637