f5e81122a0
This reverts commit c4c8b3c695.
Reason for revert: Re-enabling for R1
Change-Id: Id6706c548dcc9debbfaf2069164636bc22aa9b5e