This reverts commit 35062f8ed3. Reason for revert: Moving to R1 Change-Id: Ifd19d78015a66c9fbe9a67845232d13e011943d3
35062f8ed3