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

Change-Id: Ibdaf81cdef999a953d5aec418c558cc225fc7282