Merge "Fix ByteBuffer.put(ByteBuffer) edge case." am: 8427461b39 am: e0455939dc am: e4bb4120db
am: 97ea4b162f

Change-Id: I91618e3667c7d6e310206a8dea1f341ef2206be1