This issue was introduced in commit 4eab4965. Bug: 37710354 Test: none Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb (cherry picked from commit 0e4ac75f)