Sync

Change-Id: I355e8b6d267d471ec0dfbbfba0a940219fa1fdf1
Merge branch 'cm-12.0' of https://github.com/eousphoros/android_device_samsung_klimtwifi into cm-12.0