Merge Samsung release N9005XXUFNF4 (Update 8)

Change-Id: I36dd5d2d17648c3e9b33757f5659f5a59866e79e (reverted from commit 0591299b8580aa52eb8509e4a59d7c5890381200)