Don't resolve attributes before create

Change-Id: Idf0120b8c7fb46300462720136002bc7d7d68d31
Closes-Bug: #1332317
Merge "Don't resolve attributes before create"