Merge "Music: Fix crash from Customer Moneky test."