Merge "av: remove a redundant NULL check" am: 74e4b7bc7f am: 0e40bab475

Change-Id: I204b6302f9ffa0dd3164cbfaff6c78451f7158e1