KVT49I

Conflicts:
	core/build_id.mk

Change-Id: Id34de7947264d386367e735d381dccd6be9a3c33
KVT49K
"KVT49L"