am eaf585a1: 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 'eaf585a1bb7564891844eeee3e48ba60433487d1':