[Subject]

[Root cause and fix]

Pick-to: [branch]
Task-number: [ISSUE-ID]
Change-Id: [Gerrit will auto-generate]
Reviewed-by: <reviewer>
Reviewed-by: <reviewer>

