Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev am: cf0f301250
am: b0722aeb88

Change-Id: Iee75b36e9c6a07bbadfebd8e561edc352492520a