Merge "Small script fixes." am: 0d4977e7cd

Original change: https://android-review.googlesource.com/c/platform/development/+/1866054

Change-Id: Idb30b1d0edee49f9e8359385df2fb1933ec53e06