Update build to prevent fatal in ContentRetriever

Change-Id: I36c72fe97d84422591f6bdf0220e3a016a9727d7