Merge "Fix setServerParams to not always set snapshot pending" into pi-dev
am: 54419ca2bb

Change-Id: I15092dbcc5b328d71e3f93d92963583a54d78d54