Merge "av: remove a redundant NULL check" am: 74e4b7bc7f am: 0e40bab475 am: 43af1ebfdd am: 8da5ebf405

Change-Id: I0d46e5296db230af9ef67eb00d5e55bc824e376c