Switch to our version

origin author from tdbeta

Change-Id: I540fb6098c9100099d5367a5d4fd04b845edeb8d