Import from internal repository

Change-Id: I9c30654f5fd318d3b17f045bb51aa6664b4ec521