This reverts commit 44c4ca41d8. Reason for revert: Wanted to go with a different option and this was mistakenly Dr. No'ed. Bug: 80444486 Test: clean revert Change-Id: I7fdd13a5bc0f4d9fabf91f3e5497c4065008b531
44c4ca41d8