Merge "Fix syntax error after adding -d" am: e27e2c5448 am: 505f0a0ede am: 08baba82d6

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

Change-Id: I6c803d35a1cb35e4fa9125674b3ec9b42fe933de