Merge changes Ie34c5022,I6d21b430 into jb-mr2-dev-plus-aosp

* changes:
  Factory images for JSS16H
  Self-extractors for JSS16H