Revert "Keep specs in sync (reverted from commit 8e409954ad761835d76be397b7e23e43ea37034d)"

This reverts commit a5fbdf1d6f1c35dacbf82179840c0259ffa1bb2e.
Revert "Updated imports"

This reverts commit 099309b4034e0175bc84fc83c121c6e0abe28f08.
Revert "Revert "Revert "Merge remote-tracking branch 'upstream/master'"""

This reverts commit 3a1ffd886aeaeaa55b3b983212fb1beca05ab60f.
Revert "Revert "Merge remote-tracking branch 'upstream/master'""

This reverts commit 8f1477f999be096a84a8c94e21b4e006a3c1a68a.