Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d' * commit '94980e0f76295de53bd168608d11dba3c39cca9d': Fix NPE caused by Change I4df27119.
Merge commit '94980e0f76295de53bd168608d11dba3c39cca9d' * commit '94980e0f76295de53bd168608d11dba3c39cca9d': Fix NPE caused by Change I4df27119.