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

Change-Id: I3591732453a256554af1eabfae1a29e3583e71a3