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

Change-Id: I51ee6e90e464bfa1bae74ff8aacdf12378e15449