Merge "Fix a theoretical NPE" am: c312053b39

Change-Id: Idf4cb0acbfb9bc8fef43d42be477778e8ec2fc09