Android n mr1 preview 2
Merge "Fix dereference null pointer warning."