This reverts commit 660cf30e. bug: 34415265 bug: 34914977 Test: chrome launches Change-Id: I170365fd47313bafb0d722e6d55ee119336137c4