These changes are necessary because of commit 2bf28e62. Change-Id: I3e42e97638fe895c885bcbf44392a899284956f8