Android n mr1 preview 2
Merge \\"Fix warnings: \\"member call on null pointer of type\\"\\" am: 04cacab395
am: 4753d4c906

Change-Id: I48f631e8b873d65c0a81b9a7b8e19469f816a79a