Current code treats these nulls as if they weren't there. Bug: 172870110 Test: test-only change Change-Id: Id4632e1b004c09910b4b7613f7233d2c19e2f0ac Merged-In: Id4632e1b004c09910b4b7613f7233d2c19e2f0ac (cherry picked from commit eccd26239024ca2a401e354fb16b855fa72f9923)