Merge "Fix NPE caused by Change I4df27119." into gingerbread