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

Change-Id: I32aba0ed2a6e76e09acfb737d92ac5f8f837b052