Merge "Prevent crash when a Browsable player has an empty root"
am: e7468ca82f

Change-Id: Ie095dccdeb5b34bf8c9a4f15e97efb71ec887e93