Merge commit '11a7ba36' into froyo-plus-aosp * commit '11a7ba36': Support for apps search in apps provider contract