Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11