Merge "Resubmitting KeyProperty code change since tests failed"