Additional edits for existing kinds.
Enyo-DCO-1.1-Signed-Off-By: Jim Tang (jim.tang@lge.com)