This reverts commit dba92187. Reason for revert: DM P0 breakage (b/270255253) Change-Id: Ibf50d32e2d0cb4cc8e25ff604ecd8d92c97a56dc