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

Change-Id: I2ec0b253e8f4bc53d5b683118b9a5817b994eeff