Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp * commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad': Fix NPE caused by Change I4df27119.
Merge commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad' into gingerbread-plus-aosp * commit '07e1be62c7a8650313e7ad8690968c58ec8e88ad': Fix NPE caused by Change I4df27119.