
Applying directly to r5 instead of cherrypicking as commit contains r6 changes. Add missing include file and vendor strings. Add missing labels. Signed-off-by: Ron Stone <ronald.stone@windriver.com> Change-Id: Icf429001faa34b1414f4b1bb8e68a15090b5921d Signed-off-by: Ron Stone <ronald.stone@windriver.com>