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

Change-Id: Id38c914a250aab0b4a395739db7e700c821ddaf3