Merge "optimizing: Fix a potential nullptr dereference" am: 3b101e4bf1 am: 4e203e8907 am: 88e619f0d9
am: 2687f4bd18

Change-Id: I5bd0fe6af6e655b0e755015d456ba4b0870e870f