Merge "Fix NPE when running on Passion device."