Merge "Music: Fix null pointer exception from customer monkey test."