Merge branch 'master' into master

Author: yangaws

tests/integ/test_tf_cifar.py

@@ -35,7 +35,7 @@ def __call__(self, data):
 
 @pytest.mark.continuous_testing
 def test_cifar(sagemaker_session, tf_full_version):
-    with timeout(minutes=20):
+    with timeout(minutes=45):
         script_path = os.path.join(DATA_DIR, 'cifar_10', 'source')
 
         dataset_path = os.path.join(DATA_DIR, 'cifar_10', 'data')