more conflicting changes..

Change-Id: Idfb513cf8ebc46ea971f24a2fe5f055172dd4d4f
Resolved Conflict changes

Change-Id: Idf586c4e936c0f087e9f00ff203fba87ef9012cd