This reverts commit3c4a8e48d4. Reason for revert: NPE errors Fixes: b/138697134 Change-Id: Ic89eb58cd68485dcc5e7c5a3ef48d7ed79c303ca (cherry picked from commit4c9726e041)
This reverts commit3c4a8e48d4. Reason for revert: NPE errors Fixes: b/138697134 Change-Id: Ic89eb58cd68485dcc5e7c5a3ef48d7ed79c303ca (cherry picked from commit4c9726e041)