Missed these
Merge "Missed these" into jb4.2