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

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

Change-Id: Ia41fd84965cdb672ce83c6d18be6ee2219ae2c26