DO NOT MERGE Add empty ArrayList check.

Fixes bug 15768779.
Fixes bug 17955259.

Change-Id: I3e4c48aa0fff99025e9ba1725e3d1f3523749dbd
1 file changed