Merge "DeviceParts: Add uniform title between devices" into cm-10.1