Merge "Check null before calling clone()"
am: e1bdd513d0

Change-Id: Ifabe6352c950f9d6ead4cbdd4345ef1fb20f065d