Updated code from runtime

Change-Id: I30d020fa8155cc709c9c7fa04c9f3e0e9f0f36f2