DO NOT MERGE fix BrowseFragmentTest static variable issue
am: f56f87fd54  -s ours

Change-Id: I0792bedcba083a4a738934b5d478f73fe706fb4e