More GET not POST fixes.

Change-Id: Ie31f2c8538567560b7364226a2d48ff3e6b055b0
Merge "More GET not POST fixes."