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

Change-Id: Iaaa5d5dca2ee9ab2473ca26f425d407007f5d043