Android 6.0.1 Release 78 (MOB31S)
resolve merge conflicts of 89aa6fb to mnc-dr-dev

Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
(cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)
1 file changed