build from TeamFun

Change-Id: I05c4b4fe78c613738b494344cf662f927584e49c