This reverts commit 71842835. Fixes: 139833475 Test: make droid Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525