Bug: 141284056 Fixes: 142365481 Test: force snesor to return null Change-Id: I45583e4f1c06ec7088a7d6335597a8671555f339 (cherry picked from commit 3b745ddf) (cherry picked from commit 0a410d3a)