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

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

Change-Id: I6e6b7c5694535d2c9257ec0eea53bac0186afcec