Merge "Generalize intrinsics" into jb-mr1-dev