Settings: forward to 8.2

Change-Id: If824c4e96ec6bc4c2819fa934f113500880316f0
Merge "Settings: forward to 8.2" into du44