Merge "Move NPE up the call stack" into android11-dev