Merge "Fix snapshots for dialogs" into oc-dr1-dev
am: 089d45de8f

Change-Id: Ica95fc3e55e3291dd43bd5173899cf30a328021e