am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017c -s ours automerge: a8f4b8a2 -s ours * commit '80c26ce0':