Update functions from DevStack

Change-Id: I5abfa76e42ee3ca35c8b8fc77619d8ccfbd916cd