Test: none Change-Id: Ia8ca50c7c55b86fac84a04a5e4ef2aa36ae6bf6e Fixes: 72206319 (cherry picked from commit 7e9659fa)