This reverts commit 3c4a8e48. Reason for revert: NPE errors Fixes: b/138697134 Change-Id: Ic89eb58cd68485dcc5e7c5a3ef48d7ed79c303ca