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

Change-Id: I4c19021f7f8458035d166e17cf9476b339e151f9