Android n mr1 preview 2
Merge commit 'faca7c1efd28507258d47831423e88265a86773d' into HEAD