Android 6.0.1 Release 47 (MMB30K)
resolved conflicts for merge of e2c7d491 to master

Change-Id: I17cc5534c68d6cc1f35d294af7870b7037843525