a6ebe80fc4
This was due to a local rebase error. This should also fix the test which should have caught this. Change-Id: I6533f0bc9247298b3afae50b1eb46e6f40bf9085