Merged from from label AU_LINUX_ANDROID_JB_MR1.04.02.02.049.306 Change-Id: Ie2f7fd3d25f8f28f5d1b6e733974bb5f75999ee8
Bug: 8580410 Change-Id: Ife86cba2312cf83f263b07bfe8f3b655ec7d1a70
Change-Id: Icf126a0bbb9dec414144b9b405694e41777920d5