Merge "Merge "Fix snapshots for dialogs" into oc-dr1-dev am: 089d45de8f am: 1b891e098f" into oc-mr1-dev-plus-aosp