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

Change-Id: Idcd55e1c7f2a0d62ac3c966ebd1678450f173b9a