Merge "fix Access to field 'targets' results in a dereference of a null pointer" am: caea9fc26a
am: 52caf00e7a

Change-Id: I15f70bc8db093c14a499ef0e53abb4e62a5629ce