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

Change-Id: I71793839c817e3376d2737e4952516db1dafc1c4