Merge "Clean up some shell script copy & paste." am: b4012baaf4
am: fda05c96c1

Change-Id: I104862db5d787ffc14512bf1181332c8ca7ba872