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

Change-Id: I33d6cbdb193b1068aa5905f3d33464df9f342e0c