Merge "Removing unnecessary device sumaltion code" into tm-qpr-dev