merge from SM-N900D_JPN_KK_Opensource

Change-Id: I7fdbd3f60eb2328dfece410fdcc9909196b17da6