Merge changes Ic0f47a09,I4db2cdbf

* changes:
  Remove block_device_writer from pts suite
  Remove workarounds by data_device_bins