Refactor Transform/redefine entrypoints
am: 3732beb8c1

Change-Id: Iec3cfa18e03796728d1426ad30165ba87d83e219