This is a alternative fix to @Milutin Kristofic change (I434b5b0640d6786996ec971e7e00980cbb2595fc) Change-Id: I0593187448154bfaf1806174e9971d2b12e6f526 (cherry picked from commit eb833e9c91)
eb833e9c91