Merge "Use setParameters public API" am: ec250bc0ee am: 2c193dddd9
am: a6f06271d3

Change-Id: I4b4d4a223e0392969159ffbb36543addd3c5ee50