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

Change-Id: If6785c5f1e5d190576c97e68137cd822f43e72d9