Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb