Revert "Revert"

This reverts commit ff8fa6c46956f52472502d0d15d50e44c78119bc.

Reason for revert: Reverting revert based on team discussions

Change-Id: Ied0463a75e56f489227561f68c890b05cd8dfc97
(cherry picked from commit aa2fbd31457323abeb2e534376dd60ad277ff716)
1 file changed