Merged in kill-oscar-prpl (pull request #609)

Kill oscar prpl

Approved-by: Elliott Sales de Andrade
Approved-by: Gary Kramlich
Approved-by: Eion Robb