Merge "Avoid clearing default browser setting when unnecessary"
am: ef32746fc5

Change-Id: I647c96b9a96612c4745e6ebec5d44cebd6d42767