Merge "Replace the IDD with the '+' sign"
am: 3fdedfab76

Change-Id: I2bc2968d3d8e9a1b9958311903246f8f4e44863e