Merge "Fixes NullPointerException introduced in ag/9382746"