Merge "Possible fix for NullPointerException b/206040100." into sc-v2-dev