Removing legacy compatibility layer.

Change-Id: I6fdcea0e0faf42386dd2b8f972a3b3fb2c21b2c7
15 files changed