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

* commit '0227cebcb2faaf364c76b94e4cc5a5c9adcf1528':
  DO NOT MERGE Add empty ArrayList check.