am 1c542181: am 0227cebc: am c64522fb: am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev

* commit '1c542181e93a4ff6e2b29272237beda1583732f9':
  DO NOT MERGE Add empty ArrayList check.