Merge "Hide the empty buckets when selected network is empty." am: 19dbbd73b9
am: 9d6e30e985

Change-Id: I456416bbc2bdbb3c7a133155414a2b1fb2e9a38b