Merge commit '2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp * commit '2942391801b79816c5eb77d7ac94c4a65f26af48': Fix regression in OBB key handling
Merge commit '2942391801b79816c5eb77d7ac94c4a65f26af48' into gingerbread-plus-aosp * commit '2942391801b79816c5eb77d7ac94c4a65f26af48': Fix regression in OBB key handling