Update for KOT49H

Change-Id: I39954558db10dd3f2a059e1d21c25c72851677b3
Merge "Update for KOT49H" into android-4.4