merge from SM-N900D_JPN_KK

Change-Id: I899ce093873df68517cfc9f48914b4bfb97ae5e3