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

Change-Id: I681a59facc99f262009d01bc6a245f57eb63b13f