Introduces changes from the deprecated repository.

Change-Id: If185af1485d9d9689dfc4b48c7815e4b85e76b8f