Fixes: 23486398 Test: ensure attached bug is fixed Change-Id: I34eb265615fb26c86351d45f27227f4009ce2d09 (cherry picked from commit ec0710e3)