Somewhat obvious, but would have saved me a debugging round-trip. Change-Id: I31a69b8ba0413ed09423822b817f0d05517751b0