Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp * commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296': Add a null checking to avoid crash.
Merge commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296' into eclair-plus-aosp * commit 'ff22b182a2b8aade96d32c65b9af96ccb91f6296': Add a null checking to avoid crash.