Bug: Issue 5935 Change-Id: I1ac756bc323abd9e15a7f8b38342daff57d6d431 (cherry picked from commit 0ecc845e439b245e609c7f249d462fdae1cd56f5)