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

* commit '2448d10e267fe1d4b9eaa4779a88e38e02959195':

Change-Id: I57c73e12972f295783178b949501db098997b08b