am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017  -s ours automerge: a8f4b8a  -s ours

* commit 'ee2802ebedf920b43bd199b807b4d413c8c8cf0a':