DO NOT MERGE fix BrowseFragmentTest static variable issue am: f56f87fd54 am: aae54ddda3
am: b9f74a9973

Change-Id: I93b1c5c9bc00799fc270788705dc050c98ff9b23