am 5387f60b: Merge "Fix build breakage caused by r.android.com/162907" into mnc-dr-dev-plus-aosp

* commit '5387f60ba26ae89e31e776202fbf13287dc620a8':
  Fix build breakage caused by r.android.com/162907