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

Change-Id: I370874b94565d066762f2b1b8a4a46a5c4d92295