Merge changes from GT-S5360_GB_Opensource_Update4

Change-Id: Ic8f4fe6dffe4a9252b41118564d26f6b7621db1b