Merge "Fixes more null pointer exceptions caused by ag/9382746"