To make sure upgrades from those versions work properly Change-Id: I570cf965286bc5358a43c9601217b8781bb09b0e