Bring to 4.4_r1.2

"KRT16P"

"KRT16Q"

"KRT16R"

"KRT16S"

Change-Id: I363954f560ba720f0fd65fb1968db70b372f7cb8