Merge Samsung changes on jb_mr1_chocolate

Change-Id: Ief2e1d60ae24e187edeb2679b86bb5a56991acfc