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

Change-Id: If8d39e9cb350861913deda62b1351d8a4e52607a