Merge "Modify 16.04 ARM base image"