Fixed spans getting stripped from disclaimer am: e0b74a6de0 am: e3c31f3aec
am: 05a98e79f5

Change-Id: I279044936bb9214b84409d5674f2ba7dbb136f9a