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

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed