The previous false positive fix (df9c4a01) is enough to pass tests, and it doesn't appear that there are any remaining issues. Change-Id: Ib9812f1201ff0cd2ae8c8371737754fc328765b5
df9c4a01