This reverts commit 786f22e4. Reason for revert: Need further feedback from SMEs Bug: 130352392 Change-Id: I51b3bd19e27d28fe3aea300893da50bbf889ec73