Merge "Update base files script works anywhere." am: 7d54744e87 am: 4d2b22c781
am: 2d86069a1c

Change-Id: I5e7019e669bf284b6f5f4cf824ae8ee181940312