Improved code by updating any interfaces

Change-Id: I9a2e630c37f3c427569f5bbd773978c2705dc08c
17 files changed