Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
am: 1869973e12

Change-Id: I780f4b595fe276a3898237eb42d0852e7a7a5321