Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours
automerge: a8f4b8a -s ours
* commit 'a8f4b8a26055055cc5efa3a33862db6f5ca572a5':
This commit is contained in: