Merge for fb SDK 3.5.2