Internal merges

PiperOrigin-RevId: 181796253

Author: Ryan Sepassi

tensor2tensor/layers/common_layers.py

@@ -76,7 +76,7 @@ def shakeshake2_py(x, y, equal=False, individual=False):
   """The shake-shake sum of 2 tensors, python version."""
   if equal:
     alpha = 0.5
-  if individual:
+  elif individual:
     alpha = tf.random_uniform(tf.get_shape(x)[:1])
   else:
     alpha = tf.random_uniform([])

tensor2tensor/serving/query.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Query an exported model."""
+"""Query an exported model. Py2 only. Install tensorflow-serving-api."""
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function