(cherry picked from commit 5e40efe0ec) (cherry picked from commit d946387850) Conflicts: dev-support/docker/Dockerfile
5e40efe0ec
d946387850
Change-Id: I893319c53e497420e2b20511f0d5c0803d8515ba