This only applies to the builder made using the Dockerfile. Change-Id: I8cf1485c41fb3b7c86f0a57732f0dfdd5a3a556b