When applying patch from PR 288643 new files got lost, add these to unbreak build PR: 288643 Approved by: blanket (build fix)
When applying patch from PR 288643 new files got lost, add these to unbreak build PR: 288643 Approved by: blanket (build fix)