am 130967f3: Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev

* commit '130967f3d3f34fc656dc43e43087d0a0c3ae5439':
  SDK Addon multi-sys-img support, part 2.