Move where updateProperties is called

Change-Id: I27da448996019094c44487ce28c5689d098d6535
7 files changed