Merge "Fix issue with slippery flag not being updated correctly" into pi-dev
am: 6450335b56

Change-Id: If81769bf6e7911be9e16a2a092cff43b345dedce