KRT16P
KRT16Q
"KRT16R"
"KRT16S"

Conflicts:
	core/build_id.mk

Change-Id: Ifba0fe1abfdfb975bfd560d8e231d9af0c0709b1