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

* commit '80c26ce0f6893b2c97b88800467332b69d793e4c':