Merge with GT-I9195_JB_Opensource_Update1.zip

Change-Id: I84c8b824117f4b014c9539340686385db80b795b