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

Change-Id: I0c4cd7355cbf625c8159e98e08b359f8d014fdce