Fixes: 37192695 Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503 Test: added (cherry picked from commit cfe4ffec)