Try and back out https://github.com/tensorflow/addons/commit/e24493619ab9979280b389bd0e47794b42f80fb7
Try and back out https://github.com/tensorflow/addons/commit/e24493619ab9979280b389bd0e47794b42f80fb7

dpressel/baseline,dpressel/baseline,dpressel/baseline,dpressel/baseline