Merge "Revert^3 "Turn off the new pass manager due to miscompile"" am: c787f2b8f1 am: d7972b2e74

Change-Id: I2012fe07ac8d91ee2844b9724240e1dd0fe2b338