68c6254fb0
BUG: 123429711 This reverts commite346b2f910. Reason: launcher crashes in user build Change-Id: I57315a7969dd70aa615235ed8425d5b2a05545a6 (cherry picked from commit612bb6be7c)