DO NOT MERGE Dismiss system dialog am: 07af69531c

Change-Id: I49650bdefe90510fde2f6de95f32a7229b1a17e4