Merge "Small script fixes." am: 0d4977e7cd am: 0b29aa1937

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

Change-Id: I28a8bcd33c9a6309c0304a2d7e7d4869084763aa