Merge "Log to EventLog on prepareUserStorage failure" into tm-dev