updatePosition is the centralized place where this should happen. Change-Id: If4aab404ab0f3988af96b8d2cb1b41f39f4afa50