"KRT16S"

Conflicts:
	core/build_id.mk

Change-Id: I5112b2667470dbc540da1cff8b251d6c0373dc75