Merge "Fix NPE during restore" into android10-dev