diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java
index eda913e..7166616 100644
--- a/media/java/android/media/session/MediaSession.java
+++ b/media/java/android/media/session/MediaSession.java
@@ -144,7 +144,7 @@
             SessionLink sessionLink = manager.createSession(cbLink, tag);
             mImpl = new MediaSessionEngine(context, sessionLink, cbLink, cbStub,
                     context.getResources().getDimensionPixelSize(
-                            com.android.internal.R.dimen.config_mediaMetadataBitmapMaxSize));
+                            android.R.dimen.config_mediaMetadataBitmapMaxSize));
         } catch (RuntimeException e) {
             throw new RuntimeException("Remote error creating session.", e);
         }
@@ -723,7 +723,7 @@
 
         private QueueItem(Parcel in) {
             mImpl = new MediaSessionEngine.QueueItem(in);
-            mId = in.readLong();
+            mId = mImpl.getQueueId();
         }
 
         /**