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

Change-Id: I6429fcdc5c012f653143cb8b8161b8f1626293f9