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

Change-Id: I996d587a63d02abceb268471ec5711ec60a71e49