Removing changes not meant for MR1

Change-Id: I75136be33f12a87c2b5f21b064c06065a4145d70
8 files changed