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

Change-Id: Ia13ea5a088be3962fc6c76eb355f39a02c58b184