This reverts commit 238f630001. Reason for revert: Root cause of P0 b/205278434 Bug: 205278434 Test: Local reverted and now launcher works on wembley Change-Id: I5ee18d3ee1b671fcaedda633e7a268addd5c5c15
238f630001