Adapt to new autovalue factories

Bug: Issue 10842
Change-Id: Ie92c5fea7c3e1764f20d08eda285939743b55099
10 files changed