with null type. Bug: 37987384 Test: manual, APCT Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19