Merge "fix Access to field 'targets' results in a dereference of a null pointer"