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

Change-Id: Ie06c696c8805e188d1af3121c66f3180a9845c16