Merge changes Icd24f2c0,Ie1812552

* changes:
  Add support for analysing the COW merge operations in OTA packages.
  Update to new update_metadata.proto which support COW merge operation.