Merge "Use setParameters public API"
am: ec250bc0ee

Change-Id: Ie10fe748a7b3c29b57757dc5345145ca4f09b889