64b6195bdf
This reverts commit f86337e207.
Reason for revert: Temporary revert until there is a pi-dev build that launcher folks can flash
Change-Id: I1885d7c58d8ec5c3eaccf4abd518c375ecf65164