Android o preview 3
Merge "Fixed rest of null pointer warnings."