Merge "Change iftable to never be null"
am: 82d44f1408

Change-Id: I9a8bf5e7a49de9d865f3d05278f9894746cb9d29