Update functions file from DevStack

Change-Id: Iac97e09db1f40e76d61164971147b307fc26b3ad
Merge "Update functions file from DevStack"