The test touched by this commit exposed the bug already. Change-Id: I303131eab841ae0ea9b1a727230e68754a4cd8fe
Change-Id: I42b834528c9c75d3d97443612bb05ce198ba4dc4