Merge "Merge "Fix issue with slippery flag not being updated correctly" into...
Merge "Merge "Fix issue with slippery flag not being updated correctly" into pi-dev am: 6450335b" into pi-dev-plus-aosp
am: c272e269
Change-Id: Ie50c98030e3729fb0cd3a4ce909158fa0828fc73