This reverts commit 2b5140d3. Reason for revert: failing launcher 3 tests Change-Id: I383a38f34dc81b6b4f7d2960b47c13b4887905bf