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

* commit '84dd2ec66d408d6d619ed71a317563099d00f07f':
  DO NOT MERGE Add empty ArrayList check.