Adapting changes: device pull/13

Change-Id: I4cf59aa93e0ce726657c361d9bf804736b0c18f0