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

Change-Id: I8fcaf57abc3a0f75d552139c6ddde0919b05facf