Merge "optimizing: Fix a potential nullptr dereference"
am: 3b101e4bf1

Change-Id: If72c91b2e5d8c7e6d64874bb6ec2302e05a49f74