am 5f6bcc17: Merge "Remove some superfluous null-checks when constructing a...
am 5f6bcc17: Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb
* commit '5f6bcc17':
Remove some superfluous null-checks when constructing a CacheResult