Merge "Revert "Activity-Spec...Casablanca Release"" into beijing