Merge "Fix CTS test for playlist member insertion." into honeycomb-mr1