Minor refactoring
Merge branch 'master' into marcio

Conflicts:
	facebook/build/intermediates/manifests/tmp/manifestMerger6876547970898869310.xml