Bug: 13506939 Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5 (cherry picked from commit 3af2a37e)