This reverts commit 718428355f.
Fixes: 139833475
Test: make droid
Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525
Merged-In: I61316a8f314dccb7718bf8ab159e167d554d2525
This reverts commit 718428355f.
Fixes: 139833475
Test: make droid
Change-Id: I61316a8f314dccb7718bf8ab159e167d554d2525
Merged-In: I61316a8f314dccb7718bf8ab159e167d554d2525