am 0c8b5100: am 2a8fba36: Merge "Handle null returns from insertChild" into klp-dev

* commit '0c8b5100d6367e2747e106bf3a20d60daa45f6b6':
  Handle null returns from insertChild