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

* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.