These have been migrated in-repo in: Iaf6f8cc1eba9a75adbc824ec80d14519b4665642 Change-Id: I9f4de6d1e222bc358c7008fec1835328de3249a2 Depends-On: Ic28f2f86b3eb0c2a3c4e1c1d99449379446104a0