Merge "Exploit non-null control dependence." am: 669669c588
am: b3fbaf0835

Change-Id: I3be12bbc14dcab273ee6e716045c9775d3a37731