Merge "Merge "null check before dereference" into oc-dev am: df8569787c am: b5af86e444" into oc-dr1-dev-plus-aosp
am: 658d7677fa

Change-Id: I445df1f4ca9f59352ac4885993e68f5a5119b6a6