Android l-preview release 2
Merge "Correct message on missing permission android.permission.NFC"