Merge "Avoid potential NPE" into sc-dev