Merge "Merge "null check before dereference" into oc-dev am: df856978 am: b5af86e4" into oc-dr1-dev-plus-aosp am: 658d7677 Change-Id: I445df1f4ca9f59352ac4885993e68f5a5119b6a6