Fixed a bug in facebook friends retrieval
(cherry picked from commit 9442e9d)
Fix merge mistakes in the audit release
(cherry picked from commit 27d8a47)