* stable-2.13: Fix NullPointerException when cloning from slave Change-Id: I38925257079788ce5cec7c206967054bb445be1d