Revert "Merging new code from 'Facebook' branch"

This reverts commit 8f1720e740ef3b7474f3f91e3d6628eeebc3bf66.
Misc

It wants to sync project.properties - but says the diff is empty...  Not
sure why it wants to do that.