Merge branch 'topic/device_changes' into topic/qcom