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