Revert "Get rid of double measure"

This reverts commit 4234e6cea8c9aa34a778d21a35576e7a8d40f9a5.

Reason for revert: b/231383951

Change-Id: I41cbc5b4c036109cf45463bddb5b5cc12d11f88e
(cherry picked from commit 084bac819aa6af39bd471b27bfbd97edf2c071f1)
Merged-In: I41cbc5b4c036109cf45463bddb5b5cc12d11f88e
1 file changed