Merge "Remove the workaround for Eigen sigmoid_op" am: ede6582296 am: 05fe67c386
am: 00175dcad8

Change-Id: I9dba5adc6860f18e446a081d9d6e3244f485c2ce