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

Change-Id: I0e75dd50e4cdb735732ce34a7bd2db6cb27a215a