Merge "Quick patch for b/12446428." into jb-ub-now-kermit