Is it OK to merge the following revision(s) to the 5.0 branch?
https://reviews.llvm.org/rL310905
https://reviews.llvm.org/rL310994
Go for it, they are very safe.
Merged: r318225