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

Change-Id: I722bd340285a17645fff1bc19582e905df9519f2