We still return computed values here to keep backward compatibility. Change-Id: Idad13228efe55b2dd35224cc37c61657590f9b8e