[automerger skipped] Wait for property to be created am: c33ecdfd7b am: 83ebde3285
am: c4dd364ae5  -s ours

Change-Id: I93e5e3489cdd1e65b7c9f912efaf8327aa58f8a6