Merge "UserDataPrepare: CE storage property set too early." into pi-dev am: 85c7a9a113
am: 3a419327ea

Change-Id: I9b3c765d04c42bc55e832531b48048746feb9466