Merge "Mapping header items in BrowseFragment to multiple(2) rows." into nyc-dev am: 1e4a47c
am: f59281a

* commit 'f59281a6601d64714edd5f76a7a75c45a197e95f':

Change-Id: I81d4ececb7420c92f64de1e54582c8f5436bd197