3736f44f8e
Flag: EXEMPT fixing NPE Fixes: 28555142 Test: TAPL tests Change-Id: I722dfe196b93861723ef3de9961f0a30b9056583