Merge "Fix nullptr dereference."
am: 8e1ac14f40

Change-Id: I87d9a8c5fd09a717a119273c8a3f8d3a463e8e6c