We'd fallen a little behind. Bug: 14492135 Change-Id: Ic1137ef10bffccecebd5ce51086c23db006d0ea3
Also add a basic test. Change-Id: Icc0e68a5716b9579244f6eb8bac1ab5a24eda85a