Idb4b6de5108dd1862df7de97d0ffdc15282b1d74 recently merged and
is backport worthy to all maintained older stable releases.
I34020da6a929f5c7ae1c63bc0f2ef338c49dbe10 was committed
to stable/xena when it was still under development; the bug-fix
in question is not back portable to other stable branches, so
backporting this release note fix to stable/xena should suffice.
Change-Id: I751b6e4a3288cde7a98c0ddc55deac7a0682010d
Related-bug: #1942124
Related-Bug: #1475351
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>